Some changes, ready for test