modifications + adding base content