trying to get things working again
a few changes to get things working again