little changes
merging
some prototyping