Slightly better, but needs proper constraints