Removed Un-wanted Code
Commented Out Broken Code (Using Temp Code)