changed self => static