Rebased code, now to check if it's working or not  ?