Issue #2: New updates