prepare for integration with master