Just moving this to try and keep the method order the same for all commands