updated without frills