remove exit 1 and &&