moidfy code... BUG...