updating some methods
merging