Fixed indexes
last before demo