moving some logic to actionManager