missing files and some changes -- forgot what i did last..