added make flaggable