Fixing overlapping issue : almost finished