changed a couple of lines