modifications to better run the system