When there is allot of enamel present, I will use a selective enamel etch for my adhesive protocol.  Adhese Universal by Ivoclar can be used for selectivee enamel etch just on the enamel or full etch techniques.  It does have a self-etch quality when needed to etch just the dentin.  This tutorial will review my selective enamel etch protocol. View Video