Merged changes from yesterdays meeting