Adjustments to accomodate for potential memory issues