Made changes after review by stacko