changes made by Joel