Some changes^^ v1.1.1