changed conflicting method names