lots of changes made / added