Feature-Update

committed changes from last update.