slight improvement on the previous hack