checkpoint 050713
Everything up to date 050913