Changes made by Dan on Master branch