changes for new approach