Updated commands
Updated index