Final touches - now it should work !!!