First attempt at full (both) model