minor modifications for improved testing