Edit for portability