Bringing eric's changes to my branch