Changed the the property controller