added helper functionality
edited wrong files :-s