hopefully some speed fixes