edited from dev-nory server