Updated bin, and scripts