removed unused yaim variable and added others new