changes by tupac
merging complete