new feature..
changes for server side rendering