Fixes almost done