swap to 1.9 hash syntax throughout