various changes, new code