Added more commands / Changes to design