Attempted some timing optimization