some riot stuff added