The 2nd try to get it working