Changed last action to do last valid as well