Reverted line 71 and 101