tweaked helpers and delete