add some return statements