some changes still required