Adapat jreidinger's suggestions