some more updates after review and testing