changed a few code relative to project over normal mode (to try to kept code generic and more independent of modifier itself)
changed a few code relative to project over normal mode (to try to kept code generic and more independent of modifier itself)