after review improvments