save doortime
Re-organize some things