moved the v and o to a separate file