Merging my changes to master for testing