changed master to work in progress version