brought back features from old version (all?)