Clean Version. Fixed Space Bug