General update; new features has been added