Building overlap is now completyly fixed