Joel changes

my changes