all kinds of clean up, adding conditionals for all-in-one