Changed setup to work "de-coupled".