made changes acc to Ferdi and Richard's request