Merged changes from Christian's repo