Updated space and scraps