I still feel like there's more time save possible in this