Adapted to current usage