major code changes
conflicts updated