merge changes made for Hall