Putting things back on track

Everything should work now