Feat/updated reservation behaviour