Split into additional method