add all stuf working