Syntax improved
Improved UI