Still fixing memory issues