tack on a future flag
remove testing code