about to convert to a new more consitent style