update tut 2&3 to use new modular system