Updated scripts from master