Removed 'flag' argument