added complet message, minor optimo