better grouping and naming