updated main to match