Updated - Returning full string

Returning proper strings