Added cross terms and fixed flawed C formula