changed syntax on lines 66 and 112