Development: updated changes