minor changes. currently broken.