More size optimization + removed show effect