lots of changes.. zomgwhee