restructuring for Chitter