Slight modification, moved bridge pattern cest code to an appropriate
method.