Updated the functionality and syntax