reorganizing for more clarity