updated from hackday 3