Modifiying a few things to make it more user proof