More Fixes
Next step will be to test this implementation