[MAP]Change Lab7 implementation to meet specifications