Reduce size substantially+add messages