to work with new setup