[joes_stuff] reverted to Gary's original code