Reverted line 31