my part finished; merged with thuetter's part