Probably faster
Moved messages and errors to 1 file