An upgraded version of the Eta model