Improved old implementation and added materials