added a lot of changes
made a lot more changes