Some optimizations
Use unicorn