updated, still having bug...