improvements after review