mostly mysql changes