Improvements from @OriPekelman & @estolfo