added short name + long name