continue work on regular action handling