Added room saving