Changed ID to username/ further customer stuff