improved property system
more property system work