working functionality with the new setup