Better setup and decrap