Changed initialization