Added more actions and session fix