[IMP] more condensed code