working!
Fixed stacking
Fixed conflict