bugs code moved