rewrote parts of stuff, added smooth changes