A lot of important code added