Minor changes, no functions