removed function, combined function