Finishing backend with some changes on the run