minor changes to initial..work with this