changed positioning and added short_names