front-end updates
merged