Updated the rest to reflect improvements in space