Fixed bugs unit 2