Removed transitions - hopefully faster