Updatet with new features