added flags branch