changes based on suggestion from mmj