Updated with stuff from ld48