Updated to latest and reorganized samples a bit