updated comp with new features