lots of changes 2