removed the stuff I don't need and added a few extras