overlapping bug fixed finally. Cleanup