added features and parameters that were missing....style