changed all stuff