updated - ready for merge