up to date
merged changes
removed quiz show partial