renamed methods and buttons to be less ambiguius