modified 3 aspects working_2