just submitting cjaredp's changes...