Did some changes inside main