Combined with points request
minor changes only