Still had problems so copy and pasted from source