Modified Listing Algorithm

~50% Faster