140620

This again helps to reduce coupling ;)