small changes for backend part 2