eveything working & test working