added missing variables
deleted old version