Encorporated new PR suggestions