homepage update
merge with tim