worked on some features