update 1
update 2
merged dev; updated for production