Reworked compiler