removed unneccesary function, next: refactor