Modifications to merge with master