1.8 & 2.5 modified