revised an moved to master