Got it working this time