Trying to fix stacking issues still