Updating with Arthurs latest changes