Small changes to the system