Move to a separate script