added static and shizz