Moved conflicting code