Initial attempt at updating return type