pre-setup merged and working