static improvments