This works fine now remove commented code