had so many problems, and look at the diff .....

i'm out