More changes
Updated for jazz