Room should now update properly

Although there are other issues