Has same functionality as old version