added what i could....