ybrs's changes from koding repo