controller todo changed all perfect