not sure what changes I had
did some merge