fixed 0 logic and added twilio
handled merge conflicts