Added some returns