Redo Code for J2SE-1.5