removed hardcoded reference to user