updated for prog ass 2