modded to version 1.0
modded to version 1.2
fixed conflicts