Update with cool new shit from @Inferis