moved some info around