modifications to save even more time