Changed a bit in the facade.