Fixed Chantals Issues

Published to Website.