3.1 & 3.2 modified