Some changes #34