small tweeks to 5.36