problems added and refined