Added + modified statics