Updated for new Scala Version and Changed some Art