several changes still required