Updated with main stuff - again heh