made alterations to make it all work!