updated for May 20th patch