Two changes made as per coderoshi