Enevelope added and styles updated