changing some SUCCES return to ERROR for better readability