updated structure and added 960gs