implement some of the awesome feedback from zee