added changes from Common