Added functionality, not dealing with space and return