Return Type

Change it to return a flow instead of an Int32, plus my comments of when
i performed the change.