more changes to better suit our needs