more minor changes to better suit me