Slight changes in front-end