make more methods static