format was changed, and some warnings was fixed