I changed some constructor