lots of changes, I made a boom boom