EthanR: added a couple more inputs