Update - @antograssiot comments