working
 trying to fix jon