Changes to KeyCoder logic