few chagnes
next action bug fix