Commit #3 is..(story added)