4th Update, some functionality fixing