Added space add and remove funcitons