edited against schema 1.1