Few proposals from @hemanth