modified methods

methods modified