Some attempts to improve the second pass...