Removed statics
Small changes to recompute