removed pass 2