made some major changes
did a merge