Fixed limit bug + added offset