current version, some restyling.