Changed code to return strings