Changed flag handling, removed callout_str