Edited up to line 148