added string returns
fixed conflicvt