Made BOP Optional

Made BOP Optional