incorporated Zee's recommendations to separate concerns