Fixed line 48

Need to fix lines 52-79