changed to more reasonalbe actions