Reworked code base