Moved initialization to correct method