Small change to how the observables were created to make it more consistant.