fixing recent review comments