Make hackery as external patch