May spec updates
testing
merge