putting some hall stuff back in