some more changes to make things consistent