Made changes suggested by coderoshi