DEV-51 | Update on review