adding some more statics (still, a lot refactoring needed here)