finished separating into separate commands