fixed things and added commodity