Made my changes. It should work this time