first commit by kristoe@yahoo