some more changes, this is working!!!