merged in Zee's changes to master