updated with properties