Changed initialization method