thanks mooey! changes after initial commit