4/12 ready to merge for testing