More changes, should soon work xD