added pre-production changes