New Features

Updated version according to Jonathan's request