More inline

and some function