minor changes after local testing