Readded my modifications to Dorimanx kernel