corrected for new struct but are strange
new func - may come in handy