Slightly reworked system.prop