Adding modifications to hubo-ach. Testing now.