Fnishing up the features