edited against schema 1.1
still working on it