gnuse, try it again, made some more changes.