debug
modifications after workshop