implemented Christian's suggestions