remove exit from code !