Added all the good stuff back