moved partial and fixed controller