updated components, added flags