Bug fixed and new idea