Gunnars suggestions implemented