reworked how entries are run