restructuring slightly
improvemd
updated header file
improving header
updated