working on revised implementation of features