Functionality changes

http://pipiwiki.appspot.com/airchat?h=t-FtRqabjXlBWNwolrf8Ig