Build on findings from DefuncPush