Updated line 41-52