have stuff more working
shit may work