manual merging of daniel's changes on the github repo