Refixed Siggs stuff