refractoring of actions, better remote support impl in progress