ryan seeeeee
merge fang and ryan