Updated with sprint 3