Reorganized and improved functionality