- a few adaptations to make it run smoother