removed conflicting code