Cleanup.. Works Perfectly now