Comined errything

we combined everything