yup .. still fixing