Much improve the syntax