Added in all my local changes