Putting property change listener stuff back in