Changed some returns to fix prop-limit issue