apply Astarta's suggestions