changes after review with adam