Changed contructor