changes after review from Burhan