[IMP] code optomization