Fixed marketing issues 18,19