Achievement message handling modified