Not really happy with this way of solving the method to observer change...