add options stolen from Aaron