pull in thekraven changes