Adding limited render and smarter flag checking.