final changes for presenation, has been tested