fixed it now works and ready to merge