Added more checks
Assignment completed