Added secret keys and proper charge code