[073] code opimization