[@Duthguy] Looks good!

[@TalijaKey] Still open here