Logic updates && Updated Commands