Hw9: Added All Features