for Yuya
jack306pm
fixed conflicts
final before july 4th