Huge modifications | update to Chaplin 1.0