Alterations

Some alterations to Header and Class file