Incorporate cvasilak comments