Solving sprint 1 issues