Features 1 and 2 added