Re-applyig changes
More warning fiex; potentially unstable