username as TODO added
text simplified