made better scala version