Update for flags but still not complete
Catching up with updates...

I really need to make these commits more professional =)