Formating + Vector Changes