Changes made following dev-sprint4