I have made some teaks and changes this morning. @mcg , I have cleaned up my inbox a bit 😅

@munish @maique @smithtimmytim @sku_b