Had reorganize list because the function was not working Properly
moved return