added properties, split controllers