implementing actions
fixed merge conflicts