Added handling of different spaces and changed different price handling