Base model reworked