Addressed comments by @fwereade