updated Marissa's code and added source info