A version that can be merged with master