Updated proposed SQL a bit