some changes and server from chirayu