Updating with roof bug-fixing draft