everything moved around and extended