Finished Command reworking ....