Tweaked Collection Code, ready to test it