Removed Hard Code, Final Submission