Minor changes, requires testing