splitting old and new setup