new style and contrller changes