Hw5: Added All Features