reworked to focus on core points