Added machines and ds