Changes made for sprint2