COMMIT FOR FIXXX THE MICHA'S FUN !