More work on mass system.