added changes pre sprint 3