Hw6: Added All Features