Updated for 4.5