updated based on manual test feedback