a lot of changes made by ovidiu