adjust a bit the frontend code