updates to master 2