updates for testing and clarity