added vectorizaton support