94 mits diamante needs to go

:crackup:crackup:crackup