Commented some stuff out and new data