RE-added changes