Some changes after test with hardware