Merge changes I have made locally during these past weeks