P11 and P12 modified