Now inflating correctly
Sorting out some conflict