tweaks to Mike's setup