Implemented changes discussed with dev team