Updated for 1.5 pre release