Kort reloaded

Kort Reloaded Pull Request