Merge changes from Steven's branch