fixing map
up to the dynamic schedule
start on formula
Fixes merge issues