some changes yet to be committed