added modded sort
merged ñap + pc