Implemented new stuffs