Adapted accourding to developer comments