Trying to fix bug of overlapping things still...