removed FLAG macro and added comments