Updated with a non-windows method