Added more question marks in appropriate places