Updated front-end (just changed a bit some expressions)