Eric's hack