Move initialize() to correct place