updated copy after tamadas first feedback