Updated Custom Commands