more optimization fro release