Improved on the syntax