manual merge with last commit, updated mysql code