Completed adding discussed features