Updated main file with more features.