Fully working with new changes. #64