Removed hacky overwrites