Much improved now that construction is finally fin...

Much improved now that construction is finally finished