new features before reworking