added some render
merge with master