adding some features not sure if I worded them as I understand it