Added last few features