implementing feedback from darius