reworked properties setup