just submitting hm's changes...