build both
add automount