Medical marijuana bill more closely aligned to voter-passed