some fixed codes and new samples