Fixing errors, not working still tho