added a ton of stuff back