Revamp questions