Small changes to Space Class