more changes, starting to work