EDITING: Change username to id