added getting rid of white space, seems to be working okay