modded to version 1.0
version 1.2
merging