Added Professor Engal's changes