rearranged action class