Eta calculation removed from here