[IMP] code improved