Some changes to get it working, still not totally working due a problem
with configuration