make more functions static