Further Changes to get it working