Add more targets
Improved again