small chage
refactoring render state collection