Moved logic to #initialize