brought master up to date