Added conditions and such