// removed useless test and some tuning