adding helper methods
resolving conflicts