update to master 3