this is the only real change, the rest is mainly just making it clear where the returns actually are.