Fixed All Issues