Some functionality added. (NOT WORKS)