Haimer's branch

Helpers adding