finish up version 1