More work on granulator and percussion