Split into two scripts