updated work on feature requests