changed some Methods to static