i mixed up some of the return values