Fixed return location, added required args.