Changes in order to include the new features