Changes from sat and breaking code appart