before merge
merged johns updates and tatusyas