many style changes, almost there