Dev: updated changes