Improved bin/setup