Attempt to be more memory friendly