added more to property controller