updated based on initial feedback from clients