added changes from StudentVersion : d996f14cad5bb28a8fab1293edafd8983da90482