more changes to the code