Task #1 more change, finish details