committing so i can pull
Merge branch 'availability'