removed more get_properties() calls