Make work with new setup