andre's fix and working model(?)