More prepare() additions