last changes.
still waiting for eran to finissh his
took off message boxes