merge methods 2 and 3
clean up