MORE CORNER CASES ADDED