Added to pass2 only