Update 4:

Many changes amounst this update