Updated to 1.5 (mostly)