- Updated for more recent mysql version