Some changes which I forgot the reason for