Added command
Bug fixes after command testing