Added ranges, still fails ATM