Made some things dynamic