made life easier for merging with main branch