commit last version. all controller fixed.