Updated static
Updated headers