small optimisations
add current action