Finished dumbidea changes