improved......... BUG