New usecases

Header fix