readded header
fixed broken test
refactoring