Kracoeus 7343

This is PR #459 with cleanup