Ckozak/regenerate less