[@Noco]: Looks good to me, unless [@nitemare shape] has anything to say about it.