Stable Commit: All bug fixes done