Step- further changes