this is close to the old functionality, but not the exact same.