Downsized, so made some changes