modified 3 aspects working